Merge version 1.9.25+dfsg3-1+rpi1 and 1.9.25+dfsg3-3 to produce 1.9.25+dfsg3-3+rpi1

diff --cc debian/changelog
index c3cce15da28ba8e16c2f2ab0f49ac4971338d90d,9fbe57df122ef9395c19f8e6c75393b79c413fb8..0d2dd91b2a14f93238a5f2ecc9aa7804242abb3c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,19 +1,27 @@@
- filament (1.9.25+dfsg3-1+rpi1) trixie-staging; urgency=medium
++filament (1.9.25+dfsg3-3+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 1.9.25+dfsg2-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 27 Feb 2022 15:24:21 +0000]
 +  * Build with clang 11 to hopefully avoid armv7 contamination.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 20 Jun 2024 21:23:17 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 22 Jan 2026 00:48:18 +0000
++
+ filament (1.9.25+dfsg3-3) unstable; urgency=medium
+ 
+   * Add missing ImportExecutables-None.cmake to version control.
+     Thanks to Helmut Grohne (Closes: #1086159)
+ 
+  -- Timo Röhling <roehling@debian.org>  Thu, 04 Sep 2025 13:57:31 +0200
+ 
+ filament (1.9.25+dfsg3-2) unstable; urgency=medium
+ 
+   * Force CMake policy version to supported minimum (Closes: #1112913)
+   * Fix build with imgui 1.92 (Closes: #1112494)
+   * Add NoTrack debian/watch.
+     We do not want to track upstream because we need this
+     particular version for Open3D.
+ 
+  -- Timo Röhling <roehling@debian.org>  Mon, 01 Sep 2025 17:32:11 +0200
  
  filament (1.9.25+dfsg3-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 3d1bf2dcf02c826aee264bc7f58340037da9b244,0785b142dbac4431f58f9bb032e8e221b86e72f8..299bf47115b79b787b61c5d5272d53cb7407ad29
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -20,4 -20,4 +20,5 @@@
  0020-Fix-shebang-to-use-Python-3.patch
  0021-Do-not-build-spirv-with-Werror.patch
  0022-Fixups-for-spirv.patch
+ 0023-Fix-build-with-imgui-1.92.patch
 +auto-1.9.25+dfsg2-12+rpi1-4642f2afe8fe9adb140d2d29c4f5097b1dc46765-1696086414

diff --cc debian/rules
index c609a9bf634150ddeac910d0b25054485117c9cc,2d210c18d165cf92974c2c050e30d5a7db9c28fc..f49dc10e0fe646c13e19e0a26ca421f1418aee74
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -35,8 -35,9 +35,9 @@@ endi
  
  override_dh_auto_configure:
        dh_auto_configure -- \
 -              -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \
 +              -DCMAKE_C_COMPILER=clang-11 -DCMAKE_CXX_COMPILER=clang++-11 \
                $(CMAKE_CROSS_COMPILING_OPTIONS) \
+               -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
                -DIMPORT_EXECUTABLES_DIR=debian \
                -DFILAMENT_SKIP_SAMPLES=ON \
                -DFILAMENT_ENABLE_JAVA=OFF \